From: Sandro Knauß Date: Fri, 15 Aug 2025 22:15:04 +0000 (+0200) Subject: update hunks. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1^2~11 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=aea0530dceb2f44320d500e45a8f179d789ccabe;p=nextcloud-desktop.git update hunks. --- diff --git a/debian/patches/0003-Use-release-version-for-Debian.patch b/debian/patches/0003-Use-release-version-for-Debian.patch index 35381791f..38f11e54c 100644 --- a/debian/patches/0003-Use-release-version-for-Debian.patch +++ b/debian/patches/0003-Use-release-version-for-Debian.patch @@ -8,7 +8,7 @@ Forwarded: not-needed 1 file changed, 5 insertions(+) diff --git a/VERSION.cmake b/VERSION.cmake -index 8e9ac37..acfa1c7 100644 +index dd96a86..b41828b 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -66,3 +66,8 @@ endif() diff --git a/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch b/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch index 6300e470a..728c54531 100644 --- a/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch +++ b/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch @@ -56,10 +56,10 @@ index 8f319a3..55cd0f0 100644 return 0; } diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp -index 5d2ab48..840b433 100644 +index c95af63..39c65a2 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp -@@ -1127,10 +1127,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo( +@@ -1130,10 +1130,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo( if (_queryLocal != NormalQuery && _queryServer != NormalQuery) recurse = false; @@ -70,7 +70,7 @@ index 5d2ab48..840b433 100644 if ((item->_direction == SyncFileItem::Down || item->_instruction == CSYNC_INSTRUCTION_CONFLICT || item->_instruction == CSYNC_INSTRUCTION_NEW || item->_instruction == CSYNC_INSTRUCTION_SYNC) && item->_direction != SyncFileItem::Up && (item->_modtime <= 0 || item->_modtime >= 0xFFFFFFFF)) { -@@ -1159,13 +1155,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo( +@@ -1162,13 +1158,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo( } } @@ -82,8 +82,8 @@ index 5d2ab48..840b433 100644 - item->isPermissionsInvalid = localEntry.isPermissionsInvalid; - auto recurseQueryLocal = _queryLocal == ParentNotChanged ? ParentNotChanged : localEntry.isDirectory || item->_instruction == CSYNC_INSTRUCTION_RENAME ? NormalQuery : ParentDontExist; - processFileFinalize(item, path, recurse, recurseQueryLocal, recurseQueryServer); - }; + if (item->isDirectory() && serverEntry.isValid() && dbEntry.isValid() && serverEntry.etag == dbEntry._etag && serverEntry.remotePerm != dbEntry._remotePerm) { + recurseQueryServer = ParentNotChanged; diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp index 7edd684..f881a21 100644 --- a/src/libsync/discoveryphase.cpp